Auto merge of #2575 - alexcrichton:bump, r=alexcrichton

author bors <bors@rust-lang.org>

Thu, 14 Apr 2016 17:36:06 +0000 (10:36 -0700)

committer bors <bors@rust-lang.org>

Thu, 14 Apr 2016 17:36:06 +0000 (10:36 -0700)
author bors <bors@rust-lang.org>
Thu, 14 Apr 2016 17:36:06 +0000 (10:36 -0700)
committer bors <bors@rust-lang.org>
Thu, 14 Apr 2016 17:36:06 +0000 (10:36 -0700)
diff --cc Cargo.lock
Simple merge
diff --cc Cargo.toml
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 14 Apr 2016 17:36:06 +0000 (10:36 -0700)
committer	bors <bors@rust-lang.org>
	Thu, 14 Apr 2016 17:36:06 +0000 (10:36 -0700)
		1	2
Cargo.lock	patch \|	diff1 \|	diff2 \|	blob \| history
Cargo.toml	patch \|	diff1 \|	diff2 \|	blob \| history